:thumbsup: for code cleanup