minifying, formatting updates