Refactoring project and code style