some cleanup and organizing