Final code cleanning + implementation of recurcive relation for
components