Organised headers, removed unnecessary code, added tabular formatting for Feature 3