vol 2: Code cleanup