- more code cleanup and ordering