Just core

Made changes as per previous pull request comments.