Updated dependencys and cleaned code