cleanup: - bits_per_pixel -> bpp