Quick refactor before review