Cleaning up requirements a little