better swiftness
more swift cleaning