Housekeeping, code cleanup