code cleanup, bump deps