Refactor hospital

Ran into some silly issues, and TheTycoOne made me fix them