Refactor out double quotes and start on creating modules