Fix minor styling issues, remove superfluous return