took out version check and cleaned up a bit