Rearranged method order. Cosmetic code style change.