cleaned up some messy code