cleanup, styling, removal of console logs and dead bits