squash commits, remove uneeded method call, add spaces, small bits of cleanup