pull down to refresh

Code cleanup and some small fixes on the cypher repo ! Hope to share the results of some work open soon !