Changed: variables are private
Fixed: Checkstyle issues