clean up and added live reload