-some code cleanup, meaningful stdout