Dev: Better use of typeof - smaller compression