reorder methods, respect new format
remove unused code
passing test for new format