General

Code refactoring