Cleanup.

• Keep old method signature
• Spacing fixes