Added method comments. Cleaned code.