Addressed suggested fixes, once again