some cleanup. probabaly invalid meteor but a good start..