Refactor / update specs

Note: My ulterior motive for this PR to see if this fork of the project is being actively maintained.