Cleaning up

Made some method names much clearer