Gruntified and cleaned up code more