Made everything neat (for an alpha)