just cleaned up some code