cleaning up for better consistency