Cleanup && Ported to CoffeeScript