better log output
better names