code cleanup; blueprint added