Cleaned up after some sections