Made more tings final and cleaned up code.