Code cleaning

General code cleaning