removed whitespace and cleaned up