added syntax highlighter
refactored data
refactored tidy factory and data
implemented suggestion