Change 6

Added: return variables
Cleaned up function statements to comply with guidance