Fixed section 4 and arranged code