Issue 8: PR for Style updates