Spring core

refactor