cleanup and refactor
Make class final
make class final