making pretty and clean
made prettier
merged