Further refactor commits