main: removed some debug, fixed some whitespace