Cleaned up marker data