Refactored some minor details