Clean up some formatting, added additional comments