Minor cleanup and fixed some documentation