Cleaned up Corey's mess