Fixed expression-statement by correcting declaration-specifiers. Minor cleanups