Cleaned up code again.