refactor: use consistent names and remove spaces in arrays declarations