Minor Reformatting/Refactoring