Code cleaning, trying new things. Minor changes in general