(#543) - Simplify and cleanup