Closes #48 - cleaned up the likes list a bit