Some code cleanup done for fixes to Article Encoding