Improved documentation; Cleanup