Final commit, cleaned up formatting