try to make things cleaner