Refactored: specs a bit