Made Markers follow coding guidelines