Removed types and simplified variables