Enhance code parts separation