applying some cosmetic changes, cleanup etc