Took that logic out, get rid of spring, whitespace