Added missing license headers. Removing redundant else statement.