Code cleanup

TANGUY now passes JSHint!