Comments and cleanup!