Code cleanup. Added marker functionality.