Further code clean-up and memory clean-up