Final cleanup, commenting of code.