Make code clean and tidy