Initial Keystone Commit
Update from linting