Added few comments; Style tweaks