Removed redundant whitespace fillings; plus some minor cosmetic changes.