Fix to standarts and remove interfaces