Fixed variable constructor to take in a map instead of many parameters.
Removed editor whitespace