Cleaned up some sections