Clean up returns. Clean up code indentation
Clean up returns. Clean up code indentation