Code refactored and first report uploaded