Corrected source files along the lines of previous commits