Refactored and finished specifications