Renamed some variables
Improved output compactness and readability
More output structure improvement