Fixed name and cleaned up and formatted code.