Minor Reformatting & Refactoring