renamed stuff, cleaned up formatting