Cleaned up some critic issues