Cleaned up  variables