Cleanup: remove useless ";" and don't use reserved "char"