more updates

this commit contains updated code style AND comments