Fix bug, add helper for check image, indent bug