re-indent and cleanup
slamhound them files (im not convinced..)
simplify minor things
move db ns