Code cleanup. synced with Brackets Sprint 33 src tree