Cleanup code

I made ​​some cleanups to improve readability in some cases, eliminate the obvious typos