Fix indentation
Replace runtime cl package call
Fix variables declaration order