Various comments and small code cleanup