make it a bit cleaner