Rearranging for easier readibility