Little cleaning and organising in code, better comments