cleanup: removed unused variable
cleanup: removed redundante returns
cleanup: replaced _ with ..