migrated to scaltra
minor cleanup