Code cleanup before pushing it to production