Updates naming using verbose names
Adds comments and organizes layout