cleanup, conventions, readability, pass conf as an arg