Simplify some declarations