More crap
Streamline code using reflection