Fixes

Some code cleanup