Parameter restructuring and added docstrings