removed method comments. some re-organizing