a bit more clean up
added new greet function