Documentation & code clean-up