Added libraries and some formatting