Cleaned up variable declarations