some cleaning and comments in methods/properies etc