Lined it all up and cleaned up code