Better function naming
Fix late night syntax