Fix: Init var + remove unused vars/function calls