got rid of two returns