Splitting functions and adding comments