Edited core components and polished code listings