Fixed all coding style errors. REOL-55
Fixed comments from review. REOL-55