make the code even more simplified