Metrics and code style fixes.
Added missing files.