Add complexity values, fix few code style issues.