Change port number to be optional
Simplify fsnotify event handling