Refactor initial commit