Simplify variable names
Add other types