some visual fixes of code