Refactor: (re)formated, fixed some of the warnings.#2

aurelijusrozenas wants to merge 2 commits intorobotnic:masterrobotnic/waterbug:masterfrom

aurelijusrozenas:masteraurelijusrozenas/waterbug:masterCopy head branch name to clipboard