Code organisation
init player position
cleanup
some improvements