Some further cleaning of the code

Player tile still not working