Cleaning and code review changes