Reorganise and var names to lowercase