Cleaned up code more.