Cleaned up tiny bit