cleanup + first working draft for Nivo.KIS (keep it simple)