Revert "Fixed modules that support both node and amd not using the amd definition."

This reverts commit c366643115e6b08bc1ea70d5ac08ded98e2dfe21.
Code formatting fixes