Add return statement
Make internal functions static