removed some unnecessary "final"s