Cleaned up lots of formatting