More refactoring to make the code more compact/simple.