Cleaned the solution and added an onscreen FPS counter