source and style fix