cleaner implementation, removing unnecessary artifact