Add passport & cleaned up the server file