Codestyle change and made Key parameters final