Worked on SmartMarker class
Cleaner code