Code restructuring and deposit improvements