Adjust CI metrics
Fix code style and decrease complexity