diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
index 2a16714404e..8dbb86be09a 100644
--- a/src/vs/base/browser/dom.ts
+++ b/src/vs/base/browser/dom.ts
@@ -1067,8 +1067,8 @@ export function emmet(description: string):HTMLElement {
 	}
 
 	var result = document.createElement(match[1] || 'div');
-	match[3] && (result.id = match[3]);
-	match[4] && (result.className = match[4].replace(/\./g, ' ').trim());
+	if (match[3]) result.id = match[3];
+	if (match[4]) result.className = match[4].replace(/\./g, ' ').trim();
 
 	return result;
 };
diff --git a/src/vs/base/browser/ui/sash/sash.ts b/src/vs/base/browser/ui/sash/sash.ts
index 371bcc9b549..0074a3767b4 100644
--- a/src/vs/base/browser/ui/sash/sash.ts
+++ b/src/vs/base/browser/ui/sash/sash.ts
@@ -223,7 +223,7 @@ export class Sash extends Events.EventEmitter {
 			style = { top: horizontalProvider.getHorizontalSashTop(this) - (this.size / 2) + 'px' };
 
 			if (horizontalProvider.getHorizontalSashLeft) {
-				horizontalProvider.getHorizontalSashLeft(this) + 'px';
+				style.left = horizontalProvider.getHorizontalSashLeft(this) + 'px';
 			}
 
 			if (horizontalProvider.getHorizontalSashWidth) {
diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts
index 54339b81ffe..3528dd6bf02 100644
--- a/src/vs/base/common/async.ts
+++ b/src/vs/base/common/async.ts
@@ -281,7 +281,7 @@ export class ShallowCancelThenPromise<T> extends TPromise<T> {
 			progressCallback: ProgressCallback;
 
 		super((c, e, p) => {
-			completeCallback = c,
+			completeCallback = c;
 			errorCallback = e;
 			progressCallback = p;
 		}, () => {
diff --git a/src/vs/base/common/filters.ts b/src/vs/base/common/filters.ts
index 82c2976cb24..3e9ead4748f 100644
--- a/src/vs/base/common/filters.ts
+++ b/src/vs/base/common/filters.ts
@@ -185,9 +185,9 @@ function isCamelCaseWord(word: string): boolean {
 	for (let i = 0; i < word.length; i++) {
 		code = word.charCodeAt(i);
 
-		isUpper(code) && upper++;
-		isLower(code) && lower++;
-		isAlphanumeric(code) && alpha++;
+		if (isUpper(code)) upper++;
+		if (isLower(code)) lower++;
+		if (isAlphanumeric(code)) alpha++;
 	}
 
 	let upperPercent = upper / word.length;
@@ -205,9 +205,9 @@ function isCamelCasePattern(word: string): boolean {
 	for (let i = 0; i < word.length; i++) {
 		code = word.charCodeAt(i);
 
-		isUpper(code) && upper++;
-		isLower(code) && lower++;
-		isWhitespace(code) && whitespace++;
+		if (isUpper(code)) upper++;
+		if (isLower(code)) lower++;
+		if (isWhitespace(code)) whitespace++;
 	}
 
 	if ((upper === 0 || lower === 0) && whitespace === 0) {
diff --git a/src/vs/base/node/request.ts b/src/vs/base/node/request.ts
index c2e9ac69c5b..e62d4422925 100644
--- a/src/vs/base/node/request.ts
+++ b/src/vs/base/node/request.ts
@@ -64,8 +64,8 @@ export function request(options: IRequestOptions): TPromise<IRequestResult> {
 		});
 		req.on('error', e);
 
-		options.timeout && req.setTimeout(options.timeout);
-		options.data && req.write(options.data);
+		if (options.timeout) req.setTimeout(options.timeout);
+		if (options.data) req.write(options.data);
 
 		req.end();
 	},
diff --git a/src/vs/base/test/browser/mockDom.ts b/src/vs/base/test/browser/mockDom.ts
index bee931b2061..2fbe3fe08fc 100644
--- a/src/vs/base/test/browser/mockDom.ts
+++ b/src/vs/base/test/browser/mockDom.ts
@@ -585,10 +585,8 @@ class TextParser implements IParserState {
 		switch(char) {
 			case '<':
 				return new TagParser();
-				break;
 			case '>':
 				return new ErrorState('Unexpected >');
-				break;
 			default:
 				this.textContent += char;
 				return this;
@@ -631,7 +629,6 @@ class TagParser implements IParserState {
 			case '/':
 				this.isClosing = true;
 				return this;
-				break;
 			case '>':
 				if(this.tagName) {
 					return new TextParser();
@@ -639,7 +636,6 @@ class TagParser implements IParserState {
 				else {
 					return new ErrorState('No tag name specified');
 				}
-				break;
 			case ' ':
 				if(this.tagName) {
 					if(this.isClosing) {
@@ -708,15 +704,12 @@ class AttributeParser implements IParserState {
 				} else {
 					return this;
 				}
-				break;
 			case '=':
 				this.inValue = true;
 				return new AttributeValueParser(this);
-				break;
 			case '>':
 				stream.back();
 				return this.tag;
-				break;
 			default:
 				if(this.inValue === false) {
 					this.attributeName += char;
diff --git a/src/vs/workbench/electron-main/sharedProcessMain.ts b/src/vs/workbench/electron-main/sharedProcessMain.ts
index f4e2b06b540..73f9017314f 100644
--- a/src/vs/workbench/electron-main/sharedProcessMain.ts
+++ b/src/vs/workbench/electron-main/sharedProcessMain.ts
@@ -30,7 +30,7 @@ interface IInitData {
 }
 
 function quit(err?: Error) {
-	err && console.error(err);
+	if (err) console.error(err);
 	process.exit(err ? 1 : 0);
 }
 
diff --git a/src/vs/workbench/parts/feedback/browser/feedback.ts b/src/vs/workbench/parts/feedback/browser/feedback.ts
index 4a5782d1a74..df7003f599e 100644
--- a/src/vs/workbench/parts/feedback/browser/feedback.ts
+++ b/src/vs/workbench/parts/feedback/browser/feedback.ts
@@ -283,7 +283,7 @@ export class FeedbackDropdown extends Dropdown {
 	}
 
 	protected resetForm(): void {
-		this.feedbackDescriptionInput ? this.feedbackDescriptionInput.value = '' : null;
+		if (this.feedbackDescriptionInput) this.feedbackDescriptionInput.value = '';
 		this.sentiment = 1;
 		this.aliasEnabled = false;
 	}
diff --git a/src/vs/workbench/parts/git/browser/gitActions.contribution.ts b/src/vs/workbench/parts/git/browser/gitActions.contribution.ts
index eed96846939..e3f968012cd 100644
--- a/src/vs/workbench/parts/git/browser/gitActions.contribution.ts
+++ b/src/vs/workbench/parts/git/browser/gitActions.contribution.ts
@@ -429,8 +429,6 @@ class GlobalOpenChangeAction extends OpenChangeAction {
 				});
 			});
 		});
-
-		return Promise.as(true);
 	}
 }
 
diff --git a/src/vs/workbench/parts/git/node/git.lib.ts b/src/vs/workbench/parts/git/node/git.lib.ts
index ec95c4b9aa2..783252ae242 100644
--- a/src/vs/workbench/parts/git/node/git.lib.ts
+++ b/src/vs/workbench/parts/git/node/git.lib.ts
@@ -508,7 +508,7 @@ export class Repository {
 
 	public pull(rebase?: boolean): Promise {
 		const args = ['pull'];
-		rebase && args.push('-r');
+		if (rebase) args.push('-r');
 
 		return this.run(args).then(null, (err: GitError) => {
 			if (/^CONFLICT \([^)]+\): \b/m.test(err.stdout)) {
@@ -527,9 +527,9 @@ export class Repository {
 
 	public push(remote?: string, name?: string, options?:IPushOptions): Promise {
 		const args = ['push'];
-		options && options.setUpstream && args.push('-u');
-		remote && args.push(remote);
-		name && args.push(name);
+		if (options && options.setUpstream) args.push('-u');
+		if (remote) args.push(remote);
+		if (name) args.push(name);
 
 		return this.run(args).then(null, (err: GitError) => {
 			if (/^error: failed to push some refs to\b/m.test(err.stderr)) {