Removed some unneeded lines of code and cleaned up formatting.