Added getters and setters
Cleaned the example up a bit