Removed redundant stuff, gave more meaningful names