final final changes, code cleanup
durr