fixing formatting issues after moving some things around