Style cleanup; fix variable declaration