Fixed unreadable parts of code
Some changes