Added missing dependency
code cleanup