Clean up method internals
Fix tests
Merge pull request #1 from joomla-framework/InternalCleanup

Clean up method internals