removed unneccesary return
fixed conflict
Some refactorings out to markup for styling