Code cleanup phase 5

- Added ALL THE FINALS