Cleanup readme + comments