minor beatifications to the code