new styling, wrote some tests