Refactored to simplify @project assignment