Update Mapper and Reducer, fixed indent problems