Cleaned up twine controls