Refactoring Application:
	preparing single responsability principle