Remove old forkable references
Code formatting changes