Refactor: added minor formating