Simplify

Code cleanup too.