fixed dangling spaces, etc. for coding convention compliance