style changes and a quick scaffold to add functionality for test