Merged my local changes and fixed  formatting