A couple small fixes and some code formatting