Few comments and tweaks