refactors previous commit a bit