Remove more code
Cleanup comments, break out functions
Basic box