Revert "core,nTox,toxic - Fix for Issue #453. Begin refactoring w/astyle."

This reverts commit 2eb4f77da97e7f3191ddb8fe90572051e17e00b7.