Code cleaning etc.