Just a few coding suggestions