- removed unused unclutter code & cleanup
- fixed formatting