prettifying code - minimal changes actually made