Added documentation and removed unwanted parameters