Organized things a little bit more