Dependency resolved and check style errors removed