Cleanup and comments- Correct binary calculation