big cleanup, naming,syntaxes, etc