documentation/code clean-up in progress