Code cleanup, automatic creation of .aws-keys