Aesthetic fixes/cleaning up