Cleaned up & fixed an incorrect return