Added method comments, cleanup