Addressed suggested fixes, have a look