re-arranged methods
removed double quotes
resolved merge conflicts