Similarity commented, started code cleaning