Code cleanup + update README