Code reformatting
Code review notes fixes