Minor - Code cleaning and style