Made fixes/refactors.