Updated spec file from review comments