more final qualifiers
remove useless semi colons