Reformatted all and cleaned up
Added excluded files