Style stuff and changes from the robinator