Rename and move things around
Style cleanup