Cleaned up marker code