even more code optimizing