added and automated beautification done by jenson_bo