code cleanups and adding initial dependencies