Refactoring, made specs documentation more realistic