Fixing format errors + cleanup