Floor is now drawn
Cleaned up code