Clean source code, all features are working