Adjusted refactor a bit