Non-functional beautifications and fixes