various changes
code cleanup