Clean and quick fix from feedback