Clean up code and minor styling adjustments