Refactor Project Mojos for less code