Some more code cleanup
Call length directly in empty?, instead of alias