Project settings updated
Fix code style. Refactoring.