Simplifies some definitions