Clean Code and last upload