Made variables private/final as needed