Beautify comment box - commit 2