Improved fix for abs(val) != 0 to check other similar case. Also fixed style issues...