Clean up code
Add units to comments