Resolved warnings, improved readability of code