Code reordered

Authored by martinkostolny on Mar 6 2018, 11:33 PM.