Some code cleanup / styling changes and moving the resources to their own files.