Refactoring code 11.01.2013 12:15:00