Better arrangement and names