things.

+ made Cleaner
+ Added events, getters and setters
+ renamed
+ moved things around.