Cleaned up a tiny bit