code optimization based on jakub's feedback