refactor of dev version of project template based on real-world adjustments