Added health module and did some cleaning