slight layer refactor