Refactor methods.
Remove obsolete code.
Use new syntax.