[WiP] Code cleanup before big work#51

moonpyk wants to merge 4 commits intobugthesystem:masterbugthesystem/FireSharp:masterfrom

moonpyk:mastermoonpyk/FireSharp:masterCopy head branch name to clipboard