cleaned up function calls/returns