Cleanup + added meteor_helpers