Documentation & code cleanup