Improved compartmentalization and simpler variable declarations