Revert "Fixed compiler warning along with making return c explicit"

This reverts commit aeb718d4fc71f9b58d903f4dc029651ece01c5be.