Fixes and cleaned