Removed unneeded stuff and cleared up code style issues