Additional Testing and Refactoring