Multiple code cleanup for genabout