Style updates and code additions