Added Final keyword where it made sense