Silencing warnings, tidying.
Must be lazier!