fixed Rules compliance
fixed util issues