Cleanup & updating readme