Code cleanup, minification