Super minor cleanup stuff