more organizatoin/modularization, minify step