Add static final fields
Remove static initializer blocks