[Refactor] Select resources bundles to add less procedural
[Style] Remove trailing whitespace