Remove some logs, format some things, organize some imports
last commit for reals this time