Major code clean as I start to understand swift