Tidying of Code