Added password generator and final cleanup