Consolidates functions, improves none handling