Small Fixes
small cleanup