Method cleanup

See commits.