Make variable names follow conventions, use symbols where appropriate