Code optimizations (final modifiers and removal of redundancy)