Small changes and some formatting