nicer
cleanups and console log