Clean up code
Clean up code & tree
Edit readme