Addressed ElDeveloper's style suggestions