cleaned up some messy bits