Doc and code cleanup