More code cleanup. More efficient execution of rotation