renamed a few methods and cleaned up some time