Removed unnecessary cruft
Removed unnecessary dependencies
Removed newlines and removed empty parameters