touching up code style