Code cleanup

internal comments added and commented-out code removed