Improvments and style changes