Refactoring, Comments Added, Small Code Review