Switch to PEP-8 style.

 - Attempt to provide deprecated compatibility methods.