commented code cleaned up