Simplify code.
Merge branch 'lynx-refactor-list' into lynx-develop