Refactored few options in the spec file.