Style changes

SCFcache is slightly more understandable now