Minore updates to comply closer to early coding standards