Updated and started to clean