Added <p>, organized code