docs update / code cleanup