Use @project-version@ instead of manually changing the project version.
Delete some unused locals.
Whitespace cleanup.