Got rid of redundant ReturnStatementFiller class