Cleaned up code for efficient use

took out all unneeded tests, changed some method names for easier use, made some comments of my own.