Cleaned specs a bit more