clean up to pass -Wall