Post Sprint 1 Code Cleanup - Take 2

The same as #184. Here we go again, because some people didn't catch the deadline.