Got rid of duplicated information in order to reduce complexity and change points for upcoming algorithm changes.