Code cleanup + Updated docs