Cleaned up spec/utilities