Refactored names, killed white space, fixed bugs