Simplified process flow, fixed commented issues