Prepared for minification
Moving stuff around