Clean up code a tiny bit in various things