Fixed bug with default values in parameters

- Moved all default values to within function
- Removed width from encapsulating blocks to imrpove modularity and
size flexibility.