Restructured code
Visual tweaks