Refactoring Part 2

Also, fixed $.class.remove.
Consider creating basic assertions?