Minor styling/naming fixes