cleaner project solution?