more styling and added some tests