some cleanup
final touches