Obsolete methods replaced. Code clean-up & reformat.