Doing the * and + on literals wasn't working. Also just cleaned the code a little.