Move lines around for readability purposes per comment from author