some cleanup :)