Small refactors cleaning stuff up