code cleanup .ja