Changes for renaming demographics to level

and some checkstyle fixes