Code refactoring and tidy up