code refactoring
rearranged entries