cleaned up modeling section