Added first decrypt + further clean-up