Cleaned up coffeescript, removed iterator since I'm not using it anymore