Major code cleanup and optimizations