Beta V1.02

code cleanup.