till: cleaned up and simplified