Cleaned up more code.