Refactor minor details