refactoring - 10.09.13-05:13