renamed each method files with onMethod style, to reduce if statement.