- removed old variables, cleaned up spacing.