Streamlined model loading, clarified include hierarchy and removed redundant code