Refactoring Code, Documenting, Added Warning Message