Minor refactoring. Fixed bug where 2nd method would be lost.