Cleanup + readmy update part 2