Refactoring
Changes made by Rossen Hristov (rossen.hristov@telerik.com).