fix row problem + code indentation