removed commented code cleaned up whitespace