Fix some minor things & prettify