code cleanup and room room starting positions