Code review, remove duplicate code, cleanup for SISAArticle