- First code style improvement and tests added