More fixes and style cleaning