Reformatting the code structure