Made variables final when appropriate