Changed formatting and removed common header