removed unused vars
Updated docblocks
renamed methods to be more semantic
Updated docs