Little code clean up and refactoring