Cleanup functions code style
* use lowercase for start