simplify
style and cleanups