Code clean up and added more services