Reindented the code; removed subject from the parameters accepted