minor changes to formatting and simplify dependencies

minor changes to formatting and simplify dependencies