Merge "work on review comments and code formating. Removed white spaces"