Cleaned up the specs a litle