some minifications and optimizations