Change line returns
Fix calculations to handle decimals
Add comments