refactor garage