Refactor, change request methods, change method names, add specs