Minor changes to get rid out of red code in IntelliJ IDEA