More functionality, less code