Implemented clustered app, and a few tidies