code cleanup
final touches