Finally Constants were deleted + inspection fixes