Features

Code analysis, formatting and refactoring