Slight adjustments and refactors.