Move some stuff around, remove extra println, and clean up code style a bit