Hotfix/alex/reformat code

@IanMayo, @eugene-d Please review it and merge it primarily, Thanks.