cleanup regards to @purcell sugestion