Cleaned up get logic