Code cleaning

A bit of code cleaning