more refactorings
lenes for doors
more clean up