Made the interface a bit prettier