Cleaned up variables