Move properties into spec file; use p function