Socket files are now cleaned up

Additionally formatting