fixed #2 and restyled