Clean up whitespace
Remove constants
Fix negative number glitch