0.9.5

Code clarity rewrite