Reformatting and added support for operations