Cleanup, prettify code