Aesthetic changes made
fixed merge conflict