marker icons, indentation clean up