Improved code separation for better collaboration