a bit of refactoring

Conflicts:
	applications/rmiyc_project/populate_test_db.py
a bit of refactoring

Conflicts:
	applications/rmiyc_project/populate_test_db.py