Adding parameters and fixing style issues