Cleaned up some code and made minor performance improvements/simplifications