Simplified code and workflow