minor cleaning and functions...
minor changes, nothing big
minor changes, nothing big