Feature/clean code